projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2f5f43
)
* faces.el (read-color): Minor fix for completion function.
author
Chong Yidong
<cyd@gnu.org>
Fri, 20 Dec 2013 06:11:00 +0000
(14:11 +0800)
committer
Chong Yidong
<cyd@gnu.org>
Fri, 20 Dec 2013 06:11:00 +0000
(14:11 +0800)
lisp/ChangeLog
patch
|
blob
|
history
lisp/faces.el
patch
|
blob
|
history
diff --git
a/lisp/ChangeLog
b/lisp/ChangeLog
index bf446bc7b66fb986909b734b84fbde2cc91c3592..416f9a8b685fcf66792f56be4a98186f270f895f 100644
(file)
--- a/
lisp/ChangeLog
+++ b/
lisp/ChangeLog
@@
-1,3
+1,7
@@
+2013-12-20 Chong Yidong <cyd@gnu.org>
+
+ * faces.el (read-color): Minor fix for completion function.
+
2013-12-20 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-align-to-stmt-keywords): New
diff --git
a/lisp/faces.el
b/lisp/faces.el
index 3797056b167d21f140137fc8412051d43263d217..14be52a717c03d8182786146bea0b4ba10ddab95 100644
(file)
--- a/
lisp/faces.el
+++ b/
lisp/faces.el
@@
-1836,7
+1836,7
@@
resulting color name in the echo area."
(if (color-defined-p string)
(list string))))
((eq flag 'lambda) ; Test completion.
- (or (mem
q
string colors)
+ (or (mem
ber
string colors)
(color-defined-p string)))))
nil t)))